From: Joey Hess Date: Wed, 27 Aug 2025 16:37:07 +0000 (-0400) Subject: remove para about conflicts X-Git-Tag: archive/raspbian/10.20251029-1+rpi1~1^2~3^2~175 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com///%22http:/www.example.com/cgi/%22https:/www.github.com/?a=commitdiff_plain;h=68c900f95485e4f63c319cb7435442158bf68d53;p=git-annex.git remove para about conflicts That was only ever relevant for the v1 upgrade! --- diff --git a/doc/upgrades.mdwn b/doc/upgrades.mdwn index 7d48547d82..01e0054dfa 100644 --- a/doc/upgrades.mdwn +++ b/doc/upgrades.mdwn @@ -38,11 +38,6 @@ refuse to do anything. To upgrade, use the "git annex upgrade" command. To prevent automatic upgrades in a repository, run: `git config annex.autoupgraderepository false` -The upgrade process is guaranteed to be conflict-free. Unless you -already have git conflicts in your repository or between repositories. -Upgrading a repository with conflicts is not recommended; resolve the -conflicts first before upgrading git-annex. - The upgrade process needs to write to the repository. If the original repository cannot be written to (due to eg being on readonly media), the upgrade would need to be run in a copy of the repository.